bitkeeper revision 1.1062.1.9 (40f2be17nAuA7EGu99OX-tMqApMDPQ)

Bug fix in network backend.

diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/main.c b/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/main.c
index 8bdfdbdb1f6a9550de4477dcf62f094933976286..851cc3028510cf93c728e6da6bf747fa1149241b 100644 (file)
--- a/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/main.c
+++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/main.c
@@ -495,7 +495,7 @@ static void net_tx_action(unsigned long unused)
 
         pending_idx = pending_ring[MASK_PEND_IDX(pending_cons)];
 
-        if ( unlikely((skb = alloc_skb(PKT_PROT_LEN, GFP_ATOMIC)) == NULL) )
+        if ( unlikely((skb = dev_alloc_skb(PKT_PROT_LEN)) == NULL) )
         {
             DPRINTK("Can't allocate a skb in start_xmit.\n");
             make_tx_response(netif, txreq.id, NETIF_RSP_ERROR);